From: Rotem Liss <rotem@users.mediawiki.org>
Date: Tue, 7 Aug 2007 01:20:20 +0000 (+0000)
Subject: Fixed a display problem in the E-mail part of the preferences page when the E-mail... 
X-Git-Tag: 1.31.0-rc.0~51846
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=ba201b34a7ac6baec682f4c2ba60e13c333e87b8;p=lhc%2Fweb%2Fwiklou.git

Fixed a display problem in the E-mail part of the preferences page when the E-mail is not confirmed: the notice about it was in the same line as a preference.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 95e9a79e27..18e653d5bc 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -362,6 +362,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 10765) img_auth.php will now refuse logged-out requests where
   $wgWhitelistRead is undefined, instead of (incorrectly) honouring them
 * Fixed img_auth.php file name extraction for whitelist checking
+* Fixed a display problem in the E-mail part of the preferences page when
+  the E-mail is not confirmed: the notice about it was in the same line as
+  a preference.
 
 == API changes since 1.10 ==
 
diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 2a88117ad9..dc81c301ad 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -558,7 +558,7 @@ class PreferencesForm {
 				$skin = $wgUser->getSkin();
 				$emailauthenticated = wfMsg('emailnotauthenticated').'<br />' .
 					$skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Confirmemail' ),
-						wfMsg( 'emailconfirmlink' ) );
+						wfMsg( 'emailconfirmlink' ) ) . '<br />';
 			}
 		} else {
 			$emailauthenticated = '';
@@ -566,7 +566,7 @@ class PreferencesForm {
 		}
 
 		if ($this->mUserEmail == '') {
-			$emailauthenticated = wfMsg( 'noemailprefs' );
+			$emailauthenticated = wfMsg( 'noemailprefs' ) . '<br />';
 		}
 
 		$ps = $this->namespacesCheckboxes();